Merge branch 'integration-tests'
authorYehuda Katz <wycats@gmail.com>
Thu, 20 Mar 2014 21:10:29 +0000 (14:10 -0700)
committerYehuda Katz <wycats@gmail.com>
Thu, 20 Mar 2014 21:10:29 +0000 (14:10 -0700)
commitac69840ba5db8c6eeb17a370120f480d5d32f890
tree0baac05be88f4d63241996390d8769a5880a265a
parentd1ec90b3d867e8115f81a1328532b5e7d5851ccc
parent5fb7a4f1cc7eb2fa4d47a0df9ec8addef3c4f58e
Merge branch 'integration-tests'

Conflicts:
Makefile
src/bin/cargo-read-manifest.rs
src/bin/cargo-rustc.rs
src/cargo/mod.rs
src/cargo/util/process_builder.rs
tests/test_cargo_compile.rs